Merged with trunk at revision 162480.