Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 27 Aug 2014 08:13:12 +0000 (12:13 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 27 Aug 2014 08:13:12 +0000 (12:13 +0400)

Trivial merge