Merge branch 'MDL-31316-master-4' of git://git.luns.net.uk/moodle