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

Trivial merge