Bump 1.6 branch to 1.6.4.