Merge remote-tracking branch 'origin/master' appcode/140.2053 clion/140.2044 clion/140.2052 dbe/140.2046 phpstorm/140.2048 pycharm/140.2050 rubymine/140.2051 webstorm/140.2045 webstorm/19
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 30 Jan 2015 04:15:41 +0000 (07:15 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 30 Jan 2015 04:15:41 +0000 (07:15 +0300)

Trivial merge