Defect #2268
don't need var i
Merge branch 'diffbot-dan' into diffbot-testing