Upgrade to nginx 1.4.0
Merge branch 'nginx-1.4.0'