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