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