Merge haskell-distributed.gitub.com/development