Merge pull request #1139 from wolfmanjm/upstreamedge