Merge pull request #1322 from wolfmanjm/upstreamedge