Sync SVN r1654