Merge branch 'MDL-58464-int-fix-2' of git://github.com/ryanwyllie/moodle