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