Merge pull request #597 from davvid/dag-external-diff