Merge branch 'upload_fix'
Merge branch 'master' into upload_fix