cleaned up log files
Merge commit 'HEAD@{1}'