Adding back source that is needed for multifileupload
Merge branch 'master' into remove-ux2