Merge in new trunk changes.