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

* V5-6-patches:
  BUG #a2551: fix non-sequential cpu numbers on HP-UX. Thanks to Dave Olker.