Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 12 May 2016 09:52:38 +0000 (11:52 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 12 May 2016 09:52:38 +0000 (11:52 +0200)

Trivial merge