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