Merge branch 'MDL-66340' of https://github.com/brendanheywood/moodle