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