Merge commit '742d66a63e86ac740e610faa5abba97e7f8ad5c2' from hydra

Conflicts:
	packages/hydra/hydra-test.el
	packages/hydra/hydra.el

diff --cc packages/hydra/.travis.yml
Simple merge

diff --cc packages/hydra/Makefile
Simple merge

diff --cc packages/hydra/README.md
Simple merge

diff --cc packages/hydra/hydra-test.el
index f876e361b0607ca32ad463203ebc4e64fd869a1a,d9adba66e0f5fbf5fd5ac8e0c2aea5d11e1c931d..15eabcfdb3690118a575a743d5d59a93ba8fe76d
--- 1/packages/hydra/hydra-test.el
--- 2/hydra-test.el
+++ b/packages/hydra/hydra-test.el
@@@ -25,7 -25,7 +25,8 @@@
  ;;; Code:
  
  (require 'ert)
 +(require 'hydra)
+ (message "Emacs version: %s" emacs-version)
  
  (ert-deftest hydra-red-error ()
    (should

diff --cc packages/hydra/hydra.el
Simple merge