Merge pull request #1272 from wolfmanjm/upstreamedge