Merge pull request #1298 from ben/user-at Handle "user@" prefix for credentials partially included in URLs