Merge pull request #919 from N0YB/RELENG_2_1

XHTML Compliance