Merge branch 'MDL-25589' of git://git.luns.net.uk/moodle