Merge pull request #1121 from wolfmanjm/upstreamedge