45c199 Rebase downstream patch

Authored and Committed by Florian Müllner 5 years ago
    Rebase downstream patch