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