Merge branch 'PY-15074' of git.labs.intellij.net:idea/community into PY-15074
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 17 Apr 2015 19:53:54 +0000 (22:53 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 17 Apr 2015 19:53:54 +0000 (22:53 +0300)

Trivial merge