Merge pull request #918 from N0YB/RELENG_2_1

XHTML Compliance