Merge branch 'MDL-31314_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE