Merge from trunk revision 104c05c5284b7822d770ee51a7d91946c7e56d50.