Rebase svn trunk r1913