Merge branch 'MDL-52414_m31v7' of https://github.com/sbourget/moodle