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