Merge remote-tracking branch 'origin/master' clion/162.4
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 6 May 2016 10:26:38 +0000 (13:26 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 6 May 2016 10:26:38 +0000 (13:26 +0300)

Trivial merge