Un-hardcode crate drop actor names
Merge pull request #3239 from chrisforbes/unhardcode-crate-drop

Un-hardcode crate drop actor names