Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 30 Jul 2014 10:26:35 +0000 (14:26 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 30 Jul 2014 10:26:35 +0000 (14:26 +0400)

Trivial merge