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