Merge branch 'MDL-66253' of https://github.com/NeillM/moodle