Merge branch 'svn-trunk'