=htc #16501 render custom Date header
=htc small cleanup
Merge pull request #16519 from 2beaucoup/custom-date-header

=htc #16501 render custom Date header