Merge "Add a --output_file switch to report_sample.py"