Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 10 Sep 2014 13:11:36 +0000 (17:11 +0400)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 10 Sep 2014 13:11:36 +0000 (17:11 +0400)

Trivial merge