Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle