Merged from nginx-1.4.1