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