Alberto, I am done with testing and cleaning up the patches. I squashed my
fixes into your commits, with small comments in the commit message explaining
how they differ from the original ones.

I also re-uploaded the unrelated "username" error message cleanup and the
Google 403 workaround.

Can you check the patches one last time on your side and give me your heads up
for merging them into master?