Merge pull request #531 from wolfmanjm/upstreamedge