Merge branch 'master' into upload_twice