BUILD: nginx
Merge branch '1.1' of github.com:cockatoo-org/Cockatoo into 1.1