Merge from upstream
Merge from upstream
js2-mode: Use \\' instead of $