Merge branch 'MDL-48410' of git://github.com/timhunt/moodle