Merge pull request #1294 from wolfmanjm/upstreamedge