Merge commit '6f3ad757155b9b3089aba55ee6102ecc9bed647d' 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