Merge Shamus03's log format patch