Calendar rebase (3) 

This replaces #1352.
Changed in all places.