Calendar rebase (4) 

This replaces #1352.
Makes sense.

What to do with the usage of `_setOption()` within our code? Replace with `option()` or `_setOptions()`?