Homestyx hydra

R1:7ddaadffab0a

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