Merge pull request #33 from NoodlesNZ/overridehostname

Added global_override_hostname
Merge remote-tracking branch 'upstream/master' into metadata