Bug fix: only restrict year ranges to 4 characters.
Merge branch 'release-2.3'