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