Bug #1476

- #1476 Unicode indicators increase column width (thanks to Paul Kishimoto).
Bug #1196

- Applied patch to fix the need for PATH_MAX on GNU/Hurd (thanks to Jakub
  Wilk).