Summary of changes: f1b5ba4... Add comment regarding /etc/nginx/conf.d directory (#903065) (*) 64543c8... Merge branch 'master' into f18 (*) This commit already existed in another branch; no separate mail sent