[cvs-nhc98] Merge revs from stable-1-06-branch.