Merge pull request #924 from N0YB/RELENG_2_1

XHMTL Compliance
XHTML Compliance

NTP Status