Merge branch 'php-7.1'