Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Fri, 19 Dec 2014 13:48:27 +0000 (16:48 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Fri, 19 Dec 2014 13:48:27 +0000 (16:48 +0300)

Trivial merge