Merge branch 'MDL-76956-master' of https://github.com/sammarshallou/moodle