Merge pull request #1081 from wolfmanjm/upstreamedge