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