Merge pull request #1278 from wolfmanjm/upstreamedge