Merge branch 'MDL-60958-int-fix-1' of github.com:ryanwyllie/moodle