Merge branch 'logbuffix'