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