Update config, type_traits from master.