Merge branch 'MDL-29787_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE