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