Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 1 Sep 2014 12:54:29 +0000 (16:54 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 1 Sep 2014 12:54:29 +0000 (16:54 +0400)

Trivial merge