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