Merge branch 'logformat'