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