added gitignore composer changes
merged with upstrem
response headers fix
merged with upstream
1.7 again
merge