z6.5 Merged with latest rev.

Merged with revision 60.