Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 24 Jun 2016 13:36:12 +0000 (15:36 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 24 Jun 2016 13:36:12 +0000 (15:36 +0200)

Trivial merge