Catch up to wsf/php in SVN