Manual merge from git.haskell.org/packages/haskeline.git Original patch by Herbert Valerio Riedel <hvr@gnu.org>