Merge branch 'MDL-50719-fast-locks' of https://github.com/brendanheywood/moodle