fixed handling of URLs with @ and : symbols in password
Merge branch '1.5.x'
Merge remote-tracking branch 'upstream/master'