Bump NGINX to 1.4.2
Merge branch 'master' into development