This will result in some easily resolved merge conflicts when I merge joeyconfig into master. I never merge master into joeyconfig so that's ok.