f502cfd backport PR #534 to fix #535 and openQA #781

Authored and Committed by adamwill 7 years ago
    backport PR #534 to fix #535 and openQA #781
    
        
file added
+376
file modified
+7 -2