Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle