Merge branch 'master' into develar/pwd
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 27 Jul 2016 09:26:29 +0000 (11:26 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 27 Jul 2016 09:26:29 +0000 (11:26 +0200)

Trivial merge