Merge pull request #8413 from totten/master-ymdhis