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