Bug Fix: HTML Character encoding fix.
Merge branch 'master' into gh-pages