Support year in date math - #3828

Tests and fix for #3828