Resync svn trunk r1790