Merge pull request #5109 from hauke/striptags-from-hostname