Need to be able to handle multiple, simultaneous uploads.
Merge remote-tracking branch 'origin/master' into freebsd10