Issue #9068 - make sure we quote HTML characters correctly too (seanbright)