Merge from trunk.
Merge from trunk.
Merge with the offending files removed.
Another merge.