To deal with Unicode email addresses from Spammers
Merge branch 'master' into 2014-skin