bug fix from trunk
This tag has no release notes.