Merge branch 'termination1' of github.com:ucsd-progsys/liquidhaskell
Merge branch 'master' of github.com:ucsd-progsys/liquidhaskell