Better handling of string host names.
Merge branch 'test' into dev