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