Merge 1.6.4 stuff into master.