Merge branch 'master' of git.labs.intellij.net:idea/community
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 4 Mar 2016 16:45:47 +0000 (19:45 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 4 Mar 2016 16:45:47 +0000 (19:45 +0300)

Trivial merge