Merge branch 'mskr/webstorm-js-bugs'