Merge pull request #1281 from wolfmanjm/upstreamedge