c74a30 backport a couple of bugfixes from upstream for things that annoy me

Authored and Committed by adamwill 5 years ago
    backport a couple of bugfixes from upstream for things that annoy me
    
        
file modified
+12 -1