#689 - revert change to uploader.basic.js
Merge branch 'master' into 3.4-IP