Merge with p8 head

attempt to update code to latest CVS HEAD version.