Trying this again...
fixed
Merge branch 'nn-getHostname'