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