merge master branch to php-5.5 (sync with version 2.17.0)