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