Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 6 Jun 2014 09:12:29 +0000 (13:12 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 6 Jun 2014 09:12:29 +0000 (13:12 +0400)

Trivial merge