Merge pull request #9110 from remitamine/parse_duration