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