merge Master back up to 3.1.x

New parameter to set log_file