I find if I get a timeout on upload at the end, it is time to rebase against master.

Alan