pulled in cabal changes from master branch