Changed back to httpurlupload

The reason for this is because of files are loaded entirely
 into memory when sent. Will fix this later.
Merge remote-tracking branch 'origin/dev' into dev