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