Calendar rebase (2)

This replaces #1316.
Changed. This should be the case as long as we have two different methods for creating single and multiple datepickers.