Version bump: nginx 1.6.1
Version bump: nginx 1.7.4
Merge remote-tracking branch 'origin/nginx-1.6.1'
Merge remote-tracking branch 'origin/nginx-1.7.4'