Merge remote-tracking branch 'origin/master'
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 8 Jan 2015 15:50:48 +0000 (16:50 +0100)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 8 Jan 2015 15:50:48 +0000 (16:50 +0100)

Trivial merge