Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 17 Feb 2015 09:40:21 +0000 (12:40 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 17 Feb 2015 09:40:21 +0000 (12:40 +0300)

Trivial merge