Homestyx hydra

R1:fe4bcde59e78

Merge branch 'master' into redesign-2015
Repository: R1 hydra
Commit Date: Jul 3 2015