New nginx configuration.
Merge branch 'stable'