&trade; instead of character
Merge branch 'master' into gh-pages