Merge branch 'mskr/webstorm-js-bugs'
authorMaxim Kropotov <maxim.kropotov@jetbrains.com>
Thu, 10 Nov 2016 13:48:16 +0000 (16:48 +0300)
committerMaxim Kropotov <maxim.kropotov@jetbrains.com>
Thu, 10 Nov 2016 13:48:16 +0000 (16:48 +0300)

Trivial merge