logger is now a module-level object.
Merge branch 'master' into support/2.0