Merge pull request #933 from nico/dupeedgefix