move 1.7 stuff to correct branch
This reverts commit baf965d0d0e77829f95df76fa56dfaad3cf88855.
update readme
Merge branch '1.6.4' into 16x