fix-cabal
Merge branch fix-cabal