Bugfix for upload.py
Merge remote-tracking branch 'origin/master' into next-submission-link