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