Merge remote-tracking branch 'origin/master' rubymine/163.2171 webstorm/163.2170
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Tue, 2 Aug 2016 17:39:36 +0000 (20:39 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Tue, 2 Aug 2016 17:39:36 +0000 (20:39 +0300)

Trivial merge