cdd3b0 - Resync with master

Authored and Committed by law 7 years ago
      - Resync with master
      - Drop patch for 731228 that is no longer needed.
    
        
file modified
+2 -0
file modified
+8 -8
file modified
+2 -2