Merge branch 'fix-cabal' into recursive-package-lookup