Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 14 Oct 2014 07:45:39 +0000 (11:45 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 14 Oct 2014 07:45:39 +0000 (11:45 +0400)

Trivial merge