Merge commit 'f0b45f4a010d8e5680f66c9a22f433386d023466' from context-coloring

diff --combined packages/context-coloring/benchmark/fixtures/.nosearch
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/benchmark/fixtures/.nosearch
+++ b/packages/context-coloring/benchmark/fixtures/.nosearch

diff --combined packages/context-coloring/context-coloring.el
index 983315e1e9f38671fc478686ab1be2e67e6dfe1b,e5b5a73e5ffd2532eb3c5334ed76382a2c3e68ca..e5b5a73e5ffd2532eb3c5334ed76382a2c3e68ca
--- 1/packages/context-coloring/context-coloring.el
--- 2/context-coloring.el
+++ b/packages/context-coloring/context-coloring.el
@@@ -3,7 -3,7 +3,7 @@@
  ;; Copyright (C) 2014-2015  Free Software Foundation, Inc.
  
  ;; Author: Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
- ;; Version: 7.2.0
+ ;; Version: 7.2.1
  ;; Keywords: convenience faces tools
  ;; Package-Requires: ((emacs "24.3") (js2-mode "20150713"))
  ;; URL: https://github.com/jacksonrayhamilton/context-coloring

diff --combined packages/context-coloring/test/fixtures/.nosearch
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/benchmark/fixtures/.nosearch
+++ b/packages/context-coloring/test/fixtures/.nosearch