Update type_traits, regex from master.