Merge pull request #327 from wolfmanjm/upstreamedge