Backport version fix from trunk.