Merge branch 'MDL-63614_M37v1' of https://github.com/sbourget/moodle