Update trunk to latest .chm from xs64bit branch