Merge the config branch to master