Merge pull request #660 from mfournier/logfile-log_level