Merge branch 'fix/format-hostname'

* fix/format-hostname:
  Allow single label hostname in format string