Merge changeset browser branch to trunk.