Merge in all changes related to being able to read configuration files.