Update version to match trunk