Added year/y to date math parser
Merged upstream