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