Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 25 Apr 2016 10:22:09 +0000 (12:22 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 25 Apr 2016 10:22:09 +0000 (12:22 +0200)

Trivial merge