Adds listen_address
Merge branch 'nginx'

Conflicts:
	CHANGELOG.md