2ca22ef Pull in selected fixes from git to cover various plugins

Authored and Committed by smooge 6 years ago
    Pull in selected fixes from git to cover various plugins
    
        
file modified
+6 -1