Switched environment detection mechanism - look for 2 config files (local and global).
Merge branch '69-switch-environment-detection-in-the-app'
Merge branch 'master' into 45-migrate-away-from-ci-sessions