Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle