Calendar rebase (3) 

This replaces #1352.
And Globalize, see TODO comment.