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