Homestyx hydra

R1:29ac80be5c7d

Merge branch 'master' into redesign-2015
Repository: R1 hydra
Commit Date: Jun 17 2015