first commit
Merge https://github.com/khhuff/php-5.4