Do the beta switch in the version from_upload (bug 1103408)
Merge pull request #377 from davidbgk/1103408-second-half

Do the beta switch in the version from_upload (bug 1103408)