Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Thu, 15 Jan 2015 17:52:31 +0000 (20:52 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Thu, 15 Jan 2015 17:52:31 +0000 (20:52 +0300)

Trivial merge