Merge all updates to my copy

Merge all updates.