Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 29 Jul 2016 13:16:44 +0000 (16:16 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 29 Jul 2016 13:16:44 +0000 (16:16 +0300)

Trivial merge