Merge branch 'MDL-65812-editable-timeout' of https://github.com/brendanheywood/moodle