Rebase SVN trunk r1880