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