Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 4 Sep 2014 15:22:51 +0000 (19:22 +0400)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 4 Sep 2014 15:22:51 +0000 (19:22 +0400)

Trivial merge