Merge branch 'MDL-28655-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE