修复nginx bug
Merge branch 'master' into brahma