Use the psased-in logger, if any
Fix typo
Merge branch 'master' into no_cli
Tests to verify that passing in a logger works as expected
Merge branch 'master' into no_cli