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