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