Merge pull request #949 from N0YB/RELENG_2_1

XHTML Compliance