Merge pull request #411 from wolfmanjm/upstreamedge