Upstreaming SVN version.