Merged config changes. Terrible commit message.