09c2bbd Rebase previous patch

Authored and Committed by jgrulich 2 years ago
    Rebase previous patch