Merge branch 'ap/svn'