Merge pull request #898 from wolfmanjm/upstreamedge