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