Merge remote-tracking branch 'origin/cargoify'
Add active_object to Cargo.
Merge branch 'master' into cargoify