The log helper is no more
Merge branch 'logging'