Merge branch 'MDL-76340-311' of https://github.com/stevandoMoodle/moodle into MOODLE_...