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