Prefer group name over host name; allow all hosts to be specified
Merge branch 'master' into next