Merge branch 'MDL-30243' of github.com:lazydaisy/moodle into MDL-30243