Merge: rev776 (Better output for cleanup command)