Merge pull request #849 from wolfmanjm/upstreamedge