Update type_traits from master.
Update serialization from master.