better error message if image upload fails, #1052
Merge branch 'master' of https://github.com/designcreateplay/NodeBB