Main compatibility update with 1.6.4-R0.1

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>