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