Synchronize with trunk revision 59781.