Merge branch 'MDL-68772-master' of https://github.com/Clyxz/moodle