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