Homestyx hydra

R1:26b985006d49

Git did not 3-way merge this quite correctly.
Repository: R1 hydra
Commit Date: May 13 2014