Update type_traits from master.