9fb81f4 Rebase downstream patches

Authored and Committed by Florian Müllner 4 years ago
    Rebase downstream patches