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