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