Update hostname
Update hosts
Merge remote-tracking branch 'origin/master' into nodex