Merge branch 'MDL-39060-33' of git://github.com/zig-moodle/moodle into MOODLE_33_STABLE