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