Merge pull request #1501 from jow-/diffutils-fortify-source-compat