Finally done with calendar
Merge branch 'master' into tom