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