Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 1 Aug 2014 11:34:29 +0000 (15:34 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 1 Aug 2014 11:34:29 +0000 (15:34 +0400)

Trivial merge