Merging branch/2013-05-21/final-destroy.  Now we can finally destroy things.
Additional merges accidentally left out of changelist 182578.  Oops.