Better multiupload support
Merge branch 'f-multiupload' into dev
Merge branch 'dev'