Merge branch 'km/svn-1.8-serf-only'