More hostname madness
Merge branch 'clean-os-boot' into australian-locale