Merge remote-tracking branch 'origin/master' clion/140.50 dbe/140.45 idea/140.46 phpstorm/140.48 pycharm/140.47 rubymine/140.49 webstorm/140.51
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 9 Oct 2014 17:52:59 +0000 (19:52 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 9 Oct 2014 17:52:59 +0000 (19:52 +0200)

Trivial merge