1.7.0

Here's an updated patch for nginx 1.7.0