Merge pull request #1007 from wolfmanjm/upstreamedge