Merge from trunk rev 172662.