Made upload new version more consistent with upload
Merge pull request #2968 from nicolaasmatthijs/uploadnewversion

Made upload new version more consistent with upload