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