Merge pull request #2486 from dmitryunruh/js_keywords