Merge pull request #1008 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

Diagnostics - Tables