Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches:
  Fix handling of command names with blanks on Linux.