Merge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle