Merge branch 'dd/svn-test-wo-locale-a'