Merge pull request #626 from wolfmanjm/upstreamedge