Merge "Add support for FormData in mw.Api.upload"