Text and fix for 2464
Fix test for #2464 so it produces valid html
Merge pull request #2465 from jbalsas/fix-2464

Test and fix for #2464