Fixing incorrect merge from prefix-var branch
Fixing incorrect merge from prefix-var branch

yeahdongcn/SEnginx,yeahdongcn/SEnginx,yeahdongcn/SEnginx,yeahdongcn/SEnginx,yeahdongcn/SEnginx,yeahdongcn/SEnginx,yeahdongcn/SEnginx