Merge remote-tracking branch 'origin/master' appcode/142.2910 clion/142.2911 dbe/142.2912 phpstorm/142.2915 pycharm/142.2909 rubymine/142.2914 webstorm/142.2908
authorKonstantin Bulenkov <kb@jetbrains.com>
Tue, 30 Jun 2015 23:36:39 +0000 (01:36 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Tue, 30 Jun 2015 23:36:39 +0000 (01:36 +0200)

Trivial merge