Merge from trunk, resolve conflicts.