Merge pull request #2828 from ethomson/treediff_dont_patch diff: only compute patches when requested