Merged with trunk at revision 155767