Merge branch 'MDL-26714_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE