45c1994 Rebase downstream patch

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