dealing with html issues, refs #7755
Merge branch 'dev' into test