Merge pull request #2041 from farmergreg/to-be-or-not-to-be