Merge branch 'mr/hpux'