Merge branch 'MDL-75596-master' of https://github.com/sh-csg/moodle