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