Buffer user updates to catch relay races
Argh
Double argh - remote debugging sucks.
Relax the timeouts to 4 seconds

I think I'm done. :)
Merge branch 'master' into albumfix