Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 26 Nov 2014 12:59:39 +0000 (15:59 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 26 Nov 2014 12:59:39 +0000 (15:59 +0300)

Trivial merge