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