Merge pull request #755 from wolfmanjm/upstreamedge