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