Development: merge upstream makepkg.conf changes