Summary of changes: 04fa560... Uncomment "include /etc/nginx/conf.d/*.conf" by default (*) eea47d5... Merge branch 'master' into f18 (*) This commit already existed in another branch; no separate mail sent