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