Rebase SVN trunk r1905