Merge branch 'origin/master'
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 3 Feb 2015 10:13:52 +0000 (13:13 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 3 Feb 2015 10:13:52 +0000 (13:13 +0300)

Trivial merge