Merge pull request #391 from wolfmanjm/upstreamedge