Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict...