Merge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle