Rebase SVN trunk r1760