Merge commit '0c3a48f05d17f486a0c522f0f9ec316dce24d86d' from context-coloring

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

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

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

diff --cc packages/context-coloring/test/fixtures/block-scopes.js
Simple merge

diff --cc packages/context-coloring/test/fixtures/global.js
Simple merge

diff --cc packages/context-coloring/test/fixtures/initial-level.js
index 0000000000000000000000000000000000000000,24a4b717346aa8d1c37d261d5c5125fd7e87c00c..24a4b717346aa8d1c37d261d5c5125fd7e87c00c
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/initial-level.js
+++ b/packages/context-coloring/test/fixtures/initial-level.js

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