Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 10 Mar 2016 13:27:56 +0000 (16:27 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 10 Mar 2016 13:27:56 +0000 (16:27 +0300)

Trivial merge