Merge pull request #1299 from wolfmanjm/upstreamedge