Merge branch 'MDL-32459-master-1' of git://git.luns.net.uk/moodle