Merge pull request #1282 from wolfmanjm/upstreamedge