Merge branch 'MDL-48953_m31v4' of https://github.com/sbourget/moodle