*8843* Fix localhost and non-standard port domain use
Merge pull request #171 from asmecher/8843-tweak

*8843* Fix localhost and non-standard port domain use