Tried to fix the mess that is the log file...
Merge origin/master