use html_defuse on html output; delete spurious line
Merge commit 'github/testing' into beta