Refs #800

 * Synced with 6937c46.
Merge pull request #801 from whatthejeff/fatal_isolation_master