fix file names
Merge branch 'master' of git.php.net:/web/php