Merge pull request #301 from roger-/diffutils