Merge remote-tracking branch 'origin/master' appcode/142.4899 clion/142.4897
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Tue, 15 Sep 2015 14:56:16 +0000 (17:56 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Tue, 15 Sep 2015 14:56:16 +0000 (17:56 +0300)

Trivial merge