chore(svn): Rebase to SVN trunk r1928