Merge pull request #1079 from wolfmanjm/upstreamedge