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