Merge pull request #1256 from wolfmanjm/upstreamedge