Merge pull request #1326 from wolfmanjm/upstreamedge