Merge branch 'MDL-54656_m31v3' of https://github.com/sbourget/moodle into MOODLE_31_S...