Merge commit '0cda39255827f283e7578cd469ae42daad9556a2' 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/README.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/externs.el
Simple merge

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

diff --cc packages/js2-mode/tests/json-path.el
index 0000000000000000000000000000000000000000,70aecefb10ab0f75f8968b8f345bc2a883c64afb..70aecefb10ab0f75f8968b8f345bc2a883c64afb
mode 000000,100644..100644
--- /dev/null
--- 2/tests/json-path.el
+++ b/packages/js2-mode/tests/json-path.el

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