Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle