Merge branch 'MDL-32688-m23' of git://github.com/itamart/moodle into MOODLE_23_STABLE