Merge commit 'f4e1cbc5386fbf197ff8bcb6a9275f17c9cbe8e4' from context-coloring

diff --cc packages/context-coloring/Makefile
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/test/context-coloring-test.el
Simple merge