Merge up to mainline revision 153570.