To shared_ptr!
objectmanager
Merge branch 'master' into sebastian
sharedptr