M1.6.4 f9.11.1.964

Updated 1.6.4 branch to match master.