Merge commit '5c9d8b82dddec2fab370ec8798569c7fc5698093' from js2-mode

diff --cc packages/js2-mode/Makefile
Simple merge

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

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

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

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

diff --cc packages/js2-mode/tests/navigation.el
index 0000000000000000000000000000000000000000,d7a8314cd311279a8e87a3d27de49c2f261d0d1a..d7a8314cd311279a8e87a3d27de49c2f261d0d1a
mode 000000,100644..100644
--- /dev/null
--- 2/tests/navigation.el
+++ b/packages/js2-mode/tests/navigation.el

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