added nginx_status to master
Merge branch 'master' into 1.6