Merge fixes from multiple machines.