Merge pull request #971 from wolfmanjm/upstreamedge