Merge branch 'fixFileUploadAndroid' into 'master'

fix fileupload with android

See merge request !216
1 job for master in 3 minutes and 38 seconds (queued for 3 seconds)