Add @detharonil's %Y and more future-proof %y