Fix Cabal syntax
Merge branch 'master' into collections