Merge remote-tracking branch 'origin/dev-ihaskell' into dev-merge