Branch 1.7 initiated
Merge branch 'master' into 1.7
opened up 172 addresses to nginx_status
Merge branch 'master' into 1.6

Conflicts:
	Dockerfile