Merge branch 'MDL-62224_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE