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