Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 19 Aug 2014 14:59:34 +0000 (18:59 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 19 Aug 2014 14:59:34 +0000 (18:59 +0400)

Trivial merge