Version bump.
Merge from upstream.