Let's stop with the config things for now
Merge remote-tracking branch 'origin/master'