Database configuration will be read from environment variables if they are set.
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/INSTALL.md