Merge branch 'MDL-29400_misleading_file_upload_status' of git://github.com/gerrywasta...