merge in ucsd-progsys/liquid-fixpoint#347
merge in ucsd-progsys/liquid-fixpoint#347

ucsd-progsys/liquidhaskell,ucsd-progsys/liquidhaskell,ucsd-progsys/liquidhaskell,ucsd-progsys/liquidhaskell,ucsd-progsys/liquidhaskell,ucsd-progsys/liquidhaskell