fixed handling of URLs with @ and : symbols in password
Merge branch '1.5.x'