Merge pull request #800 from wolfmanjm/upstreamedge