Logger tweaks

@sebastienblanc please review

_this_ needs to go to master

6c6ebb5c293fc3766db1c0876d2d2c6c974d891f needs to go to 1.0.x branch
formatting