Convert HTML entities to UTF-8 characters
Merge upstream branch 'master' into dev