Merge pull request #1080 from wolfmanjm/upstreamedge