Merge branch 'MDL-53369_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE