Merge branch 'MDL-23887-33-2' of https://github.com/snake/moodle into MOODLE_33_STABLE