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