Merge branch 'MDL-54655_m32v1' of https://github.com/sbourget/moodle