Merge pull request #719 from wolfmanjm/upstreamedge