94af81b new upstream, merge

Authored and Committed by nickblack 2 years ago
    new upstream, merge