Merge remote-tracking branch 'origin/master'
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 11 May 2016 11:27:19 +0000 (14:27 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 11 May 2016 11:27:19 +0000 (14:27 +0300)

Trivial merge