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