Merge pull request #781 from wolfmanjm/upstreamedge