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