[perl-DateTime/f17] (8 commits) ...Resolve merge conflicts