don't use DEBUG during testing
Merge branch 'logLevel' into 1.7.x