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