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