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