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