Homestyx hydra

R1:7cc8a73d1efd

Merge 2015 Redesign ("redesign-2015" -> "master")

For discussion, see T8549.
Repository: R1 hydra
Commit Date: Jul 5 2015