Merge with Trunk Revision 10743
Remove phrases.cfg.
Merge conflicts.