Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 6 Feb 2015 11:11:39 +0000 (14:11 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 6 Feb 2015 11:11:39 +0000 (14:11 +0300)

Trivial merge