Port and fix calendars chapter
Merge remote-tracking branch 'origin/stable45'