Better configuration support with simpler reliance on files and / or environment variables (from Azure)
Merge branch 'developing' into staging