Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle