Merge branch 'MDL-74958-m400' of https://github.com/sammarshallou/moodle into MOODLE_...