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