Merge remote-tracking branch 'origin/master' appcode/142.5134 clion/142.5133 dbe/142.5132 idea/142.5136 phpstorm/142.5142 pycharm/142.5138 rubymine/142.5140 webstorm/142.5143
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 24 Sep 2015 21:54:26 +0000 (00:54 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 24 Sep 2015 21:54:26 +0000 (00:54 +0300)

Trivial merge