Merge pull request #966 from wolfmanjm/upstreamedge