Merge "Fix mishandling of special characters in passwords"