Update atomic from master.
Update smart_ptr from master.