add fixes from 1.6 branch.  update version # for release