Merge remote-tracking branch 'origin/master'
authornik <Nikolay.Chashnikov@jetbrains.com>
Thu, 5 May 2016 10:47:15 +0000 (13:47 +0300)
committernik <Nikolay.Chashnikov@jetbrains.com>
Thu, 5 May 2016 10:47:15 +0000 (13:47 +0300)

Trivial merge