Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 9 Jul 2014 13:09:37 +0000 (17:09 +0400)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 9 Jul 2014 13:09:37 +0000 (17:09 +0400)

Trivial merge