re #919 - Properly sanitize the date
Merge branch 'feature/919-hours' into staging