Merged from from @chrissie1 on DateHumanizer
Merge remote-tracking branch 'origin/master'