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