Merge branch 'origin/master'
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 10 Feb 2015 12:55:49 +0000 (15:55 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 10 Feb 2015 12:55:49 +0000 (15:55 +0300)

Trivial merge