Merge commit '7558a961a03b3a9d26fafc69d9665e4aadf47738' from js2-mode

diff --cc packages/js2-mode/NEWS.md
index 0000000000000000000000000000000000000000,eea51d38f7842be489604bce13904f650afc01da..eea51d38f7842be489604bce13904f650afc01da
mode 000000,100644..100644
--- /dev/null
--- 2/NEWS.md
+++ b/packages/js2-mode/NEWS.md

diff --cc packages/js2-mode/README.md
Simple merge

diff --cc packages/js2-mode/js2-imenu-extras.el
Simple merge

diff --cc packages/js2-mode/js2-mode.el
Simple merge

diff --cc packages/js2-mode/tests/externs.el
Simple merge

diff --cc packages/js2-mode/tests/indent.el
Simple merge

diff --cc packages/js2-mode/tests/parser.el
Simple merge