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