Merge latest trunk into this branch.