Merge branch 'MDL-48778-29' of git://github.com/lameze/moodle into MOODLE_29_STABLE