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