Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 6 Oct 2014 15:02:58 +0000 (19:02 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 6 Oct 2014 15:02:58 +0000 (19:02 +0400)

Trivial merge