Merge "Add --bugreport option." into ics-mr0