8422d21fb8
when integrated back into Perforce. This avoids unnecessary conflicts during the loopback of files maintained in Perforce.