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