Merge commit 'f062d5a55496e22cf89f2ef9778a24a840a5a68e' from context-coloring

diff --cc packages/context-coloring/Makefile
Simple merge

diff --cc packages/context-coloring/README.md
Simple merge

diff --cc packages/context-coloring/benchmark/context-coloring-benchmark.el
Simple merge

diff --cc packages/context-coloring/context-coloring.el
Simple merge

diff --cc packages/context-coloring/scripts/dependencies
index 0000000000000000000000000000000000000000,c2a91075fe5ce34b3e3e6112bf6f5cab224863da..c2a91075fe5ce34b3e3e6112bf6f5cab224863da
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/dependencies
+++ b/packages/context-coloring/scripts/dependencies

diff --cc packages/context-coloring/scripts/download-dependencies.el
Simple merge

diff --cc packages/context-coloring/test/context-coloring-test.el
Simple merge

diff --cc packages/context-coloring/test/fixtures/comments-and-strings.js
Simple merge