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