Rebase SVN trunk r1877