Merge branch 'MDL-19263-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE