fix haskell mode
Merge branch 'master' into windows