467bdc5 Fix failure to run tests and backport patch for ebz#489953 in order to fix

Authored and Committed by mbooth 8 years ago
    Fix failure to run tests and backport patch for ebz#489953 in order to fix
    
      some unit tests
    
        
file modified
+12 -0
file modified
+51 -13
file modified
+7 -1