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