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