Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 5 Feb 2015 09:43:27 +0000 (12:43 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 5 Feb 2015 09:43:27 +0000 (12:43 +0300)

Trivial merge