More closely match behavior of default logger
Merge branch 'master' into bootstrap