Merge "Remove warning for unnused 4th argument on wikidiff2"