ed4648 Apply a combined patch from master to fix several reported issues

Authored and Committed by Richard Hughes 7 years ago
    Apply a combined patch from master to fix several reported issues
    
      with the OS update feature.
    
        
file modified
+9 -1