Merge from nginx-1.4.0