Merge branch 'wip-MDL-62215-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE