Merge branch 'MDL-62535-master-fix' of github.com:abgreeve/moodle