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