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