Merge remote-tracking branch 'origin/develar/pwd'
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 29 Jul 2016 08:19:00 +0000 (10:19 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 29 Jul 2016 08:19:00 +0000 (10:19 +0200)

Trivial merge