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