Merge in upstream makepkg.conf changes.