Fix years controller
Merge branch 'master' into dialog-cleanup