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