Pull in fix from trunk.