Merge pull request #1307 from wolfmanjm/upstreamedge