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