Fixes for Mozilla browsers
Merge branch 'master' into 19-upload