Merge remote-tracking branch 'origin/master'
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 19 Apr 2016 14:00:37 +0000 (17:00 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 19 Apr 2016 14:00:37 +0000 (17:00 +0300)

Trivial merge