Merge pull request #1132 from wolfmanjm/upstreamedge