blaat
Merge remote-tracking branch 'upstream/master'
Changed log file output and path, and some logging messages