Merge branch 'master' of https://github.com/php/php-src
...
Merge branch 'master' of http://github.com/krakjoe/php-src into expect