Merge pull request #858 from wolfmanjm/upstreamedge