Rebase SVN trunk r1892