Merge "Add 'avoidhours' option to Language#formatTimePeriod"