Merge pull request #1344 from wolfmanjm/upstreamedge