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