Merge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle