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