Merge pull request #397
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 11 May 2016 10:54:47 +0000 (13:54 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 11 May 2016 10:54:47 +0000 (13:54 +0300)

Trivial merge