Merge branch 'hotfix/1.11.3'
Clean up error message when uploading a file through ajax fails
Merge branch 'hotfix/1.11.4' into develop