Merge branch 'MDL-27619_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE