Merge pull request #1338 from wolfmanjm/upstreamedge