Merge latest trunk changes with this branch.