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