Merge branch 'master' of git.labs.intellij.net:idea/community appcode/142.4791 clion/142.4794
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 11 Sep 2015 14:57:32 +0000 (17:57 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 11 Sep 2015 14:57:32 +0000 (17:57 +0300)

Trivial merge