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