Merge remote-tracking branch 'origin/master' webstorm/163.6012
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sun, 9 Oct 2016 17:25:41 +0000 (19:25 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sun, 9 Oct 2016 17:25:41 +0000 (19:25 +0200)

Trivial merge