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