Merge remote-tracking branch 'origin/master' clion/142.4140 dbe/142.4137 pycharm/142.4142 webstorm/142.4138
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 20 Aug 2015 03:37:04 +0000 (06:37 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 20 Aug 2015 03:37:04 +0000 (06:37 +0300)

Trivial merge