merge haskell 69cd413f7dc37434d0629f6e49920954a01e66de

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>