Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 11 Aug 2016 10:05:20 +0000 (13:05 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 11 Aug 2016 10:05:20 +0000 (13:05 +0300)

Trivial merge