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