Merge branch 'MDL-31923-master-6' of git://git.luns.net.uk/moodle