Fixed a bug with appsettings.
Merge branch 'master' into production