#1239 Avatar Upload: Wrong error message
Merge remote-tracking branch 'upstream/master' into bugs9
Merge remote branch 'xillibit/bugs9' into merges
Minor modifications to #1239 Avatar Upload: Wrong error message