Merge remote-tracking branch 'origin/master' webstorm/162.426.9
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 24 May 2016 14:19:02 +0000 (17:19 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 24 May 2016 14:19:02 +0000 (17:19 +0300)

Trivial merge