Merge branch 'master' of git.moodle.org:/git/integration