Merge pull request #878 from wolfmanjm/upstreamedge