Pushed upstream. cmr:v1.7.3:reviewer=jsquyres This commit was SVN r29201.
This commit was SVN r28348.