Homestyx hydra

R1:b55f9b6120be

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