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