As for the RFC on which this PR is based, apparently host names can have underscores: http://tools.ietf.org/html/rfc3986#page-18
Or am I missing something?