Merge "The old clean target had bit rotted." into gingerbread