'add_upload_mask'
'add_upload_timeout'
update dialog
update upload image
Merge branch 'develop'
Merge branch 'master' into gh-pages