Merge pull request #1244 from wolfmanjm/upstreamedge