Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 28 Jun 2016 14:58:13 +0000 (16:58 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 28 Jun 2016 14:58:13 +0000 (16:58 +0200)

Trivial merge