Merge "Allow a non-127.0.0.1 definition for the hostname."