3189369 Backport PR #1146 to fix a bug that #1142 introduced

Authored and Committed by adamwill 4 years ago
    Backport PR #1146 to fix a bug that #1142 introduced
    
        
file added
+76
file modified
+8 -1