Merge branch 'MDL-25492_22' of git://github.com/jmvedrine/moodle into MOODLE_22_STABLE