Fix parsing of typed input for 12 hour format
Merge branch 'refs/heads/master' into time_only