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