Merged trunk at revision 161680 into branch.