Merge pull request #12159 from peter-stadler/nginx-smp