Merge pull request #827 from wolfmanjm/upstreamedge