Merge branch 'rj/gitweb-test-sans-date-parser'