php-fpm + nginx config
syntax errors
Merge branch 'master' into dev-nginx