Logger: Merge Upstream stuff from N5

* Most importantly the ability to turn off this stupid thing

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>