Calendar rebase (3) 

This replaces #1352.
Why are you using an internal method from another widget? Use the public `option()` method.