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