Homestyx hydra

R1:524aa39aa2f5

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