Merge "Ignore some auto-generated files"