Merge pull request #1324 from wolfmanjm/upstreamedge