Merge branch 'MDL-67818-check-api-fixes' of https://github.com/brendanheywood/moodle