Merge branch 'MDL-30616-master-7' of git://git.luns.net.uk/moodle