Merge branch 'mo/hpux-dynpath'