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