Merge "Fix mishandling of special characters in passwords"

No match.