Rebase to latest trunk
7 files changed