Properly pad log prefixes
Merge branch 'log-prefix' into next