Merge branch 'MDL-35257' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE