Merge pull request #920 from N0YB/RELENG_2_1

XHTML Compliance