Merge --quiet fixes from trunk r6112:6113