Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle