Merge branch 'MDL-31135_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE