Merge into nginx-1.4.1