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