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

Trivial merge