Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 16 Feb 2015 18:35:16 +0000 (21:35 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 16 Feb 2015 18:35:16 +0000 (21:35 +0300)

Trivial merge