gethostname introduced in 5.3 not back compat with 5.2
Merge branch 'master' into hg-production