Merge pull request #1348 from wolfmanjm/upstreamedge