Patch provided by Fujitsu (Kawashima, Takahiro) cmr=v1.8.2:reviewer=jsquyres This commit was SVN r32190.
This commit was SVN r25860.