Merge branch 'hold/svn'