Merge commit 'e342c330807fdd09adba974611122d1c95bdf07d' from hydra

diff --cc packages/hydra/Makefile
Simple merge

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

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

diff --cc packages/hydra/hydra-ox.el
index 0000000000000000000000000000000000000000,40530813f5c287cab7dca4187ee4f01045939938..40530813f5c287cab7dca4187ee4f01045939938
mode 000000,100644..100644
--- /dev/null
--- 2/hydra-ox.el
+++ b/packages/hydra/hydra-ox.el

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

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

diff --cc packages/hydra/lv.el
index 0000000000000000000000000000000000000000,7b190745dbc55d4742f2884abc81196ba483692f..7b190745dbc55d4742f2884abc81196ba483692f
mode 000000,100644..100644
--- /dev/null
--- 2/lv.el
+++ b/packages/hydra/lv.el