Homestyx hydra

R1:bfca11dbbadf

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