Pull in fix for AutoHostname

Seems trivial enough.

I have had not success in compiling a kayak image. So I do admit I have not tested this.