Make old 'cycling = Yearly' sections explicit.
Merge pull request #1145 from hjoliver/more-back-compat

Make old 'cycling = Yearly' sections explicit.