Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 22 Jul 2016 10:18:05 +0000 (12:18 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 22 Jul 2016 10:18:05 +0000 (12:18 +0200)

Trivial merge