CVJ-15/CVJ-36: Fixed issue with adding months/years to date.