fix year-specific DateMath tests
Merge remote branch 'upstream/master'