Updates to improve handling of upload jobs.
Merge branch 'master' of https://github.com/chlige/cyanos