[teraflop]

It's a merge commit, so naturally it's going to have a huge diff even if the actual work was done in much smaller increments.