When acceptNullYears is true, use year if present.
Merge pull request #393 from atlasapi/null-year-equivalence

When acceptNullYears is true, use year if present.