Merge branch 'MDL-71174' of git://github.com/danmarsden/moodle