Rebase SVN trunk r1907