Saving these settings for local server on separate branch.
Merge branch 'master' into local
Merge branch 'master' into local
I will need to change paths, after.