Merge pull request #990 from wolfmanjm/upstreamedge