Merge trunk into this branch.