Merge branch 'MDL-36741_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE