Merge pull request #941 from N0YB/RELENG_2_1

XHTML Compliance