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