Rebase svn trunk r1789