Merge branch 'w43_MDL-29925_m19_calendar' of git://github.com/skodak/moodle into...