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