Calendar rebase (3) 

This replaces #1352.
Missing dependency for `$.date`.