Merged haskell changes from ilyagr