Multithreaded upload devel

Accidently pushed (again) to a different branch than it was supposed to.