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