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