Merge branch 'MDL-80619' of https://github.com/paulholden/moodle