Calendar rebase (3) 

This replaces #1352.
This indentation is whacky.