Pass all options to #upload

We aren't actually passing all the options to the uploader. This, I think, is related to #667 

Also would need backported.