Merge branch 'MDL-55867_m33v1' of https://github.com/sbourget/moodle