Convert to 24 hour format properly for edge cases (midnight and noon)
Merge branch 'refs/heads/12_hour_format'