Merge pull request #627 from wolfmanjm/upstreamedge