Merge branch 'MDL-22469-master' of https://github.com/StudiUM/moodle