5b3a065 Update to latest git, re-sync spec and patches

Authored and Committed by adamwill 4 years ago
    Update to latest git, re-sync spec and patches
    
    Also fix test execution in mock.
    
        
file modified
+2 -0
file modified
+42 -20
file modified
+2 -2