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