Merge branch 'MDL-54656_m32v3' of https://github.com/sbourget/moodle