Merge from trunk revision 7ad5a72c8bc6aa71a0d195ddfa207db01265fe0b.