Merge pull request #423 from wolfmanjm/upstreamedge