Merge "Add virtual destructor to please one of our compilers."