Merge remote-tracking branch 'origin/master'
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 21 Jan 2015 11:54:44 +0000 (12:54 +0100)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 21 Jan 2015 11:54:44 +0000 (12:54 +0100)

Trivial merge