Merge pull request #581 from wolfmanjm/upstreamedge