Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle