Merge pull request #926 from N0YB/RELENG_2_1

XHTML Compliance