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