Merge pull request #934 from wolfmanjm/upstreamedge