Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 6 Apr 2016 05:07:10 +0000 (08:07 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 6 Apr 2016 05:07:10 +0000 (08:07 +0300)

Trivial merge