Rebase SVN trunk r1788