Merge commit '97c2270f7138530de21f773f094c1495498cac78' from hydra

diff --cc packages/hydra/hydra-ox.el
index 1dc70885097c39fffaffafe599f65ab7c0b0a8ae,0d489e5f75bd787c673157a7ada6a68def46e69d..e8d48e34a5827764afe8791bae9016b027ba7198
--- 1/packages/hydra/hydra-ox.el
--- 2/hydra-ox.el
+++ b/packages/hydra/hydra-ox.el
@@@ -24,8 -24,9 +24,10 @@@
  ;; This shows how a complex dispatch menu can be built with Hydra.
  
  ;;; Code:
+ 
+ (require 'hydra)
  (require 'org)
 +(require 'hydra)                        ;`defhydradio' is not autoloaded!
  
  (defhydradio hydra-ox ()
    (body-only "Export only the body.")

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

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