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