merge master branch to php-5.5