Merge pull request #532 from wolfmanjm/upstreamedge