Merge pull request #1330 from wolfmanjm/upstreamedge