Merge pull request #968 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

Interfaces